From 64dd1b77aeb73819217b98a0682728d1369dc562 Mon Sep 17 00:00:00 2001 From: Ewan Mellor Date: Tue, 24 Oct 2006 14:47:41 +0100 Subject: [PATCH] This puts two small fixes in the xm-test suite: - it turns off verbose mode of the ACM module - copies the test policy to the policies directory only if the directory has been created Signed-off-by: Stefan Berger --- tools/xm-test/lib/XmTestLib/acm.py | 2 +- tools/xm-test/runtest.sh | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/tools/xm-test/lib/XmTestLib/acm.py b/tools/xm-test/lib/XmTestLib/acm.py index dd1e67646d..a0d8a43c09 100644 --- a/tools/xm-test/lib/XmTestLib/acm.py +++ b/tools/xm-test/lib/XmTestLib/acm.py @@ -26,7 +26,7 @@ except: ACM_LABEL_RESOURCES = False labeled_resources = {} -acm_verbose = True +acm_verbose = False def isACMEnabled(): return security.on() diff --git a/tools/xm-test/runtest.sh b/tools/xm-test/runtest.sh index 623598cd20..7008972fae 100755 --- a/tools/xm-test/runtest.sh +++ b/tools/xm-test/runtest.sh @@ -199,7 +199,10 @@ run=yes unsafe=no GROUPENTERED=default -cp -f tests/security-acm/xm-test-security_policy.xml /etc/xen/acm-security/policies +if [ -d /etc/xen/acm-security/policies ]; then + cp -f tests/security-acm/xm-test-security_policy.xml \ + /etc/xen/acm-security/policies +fi # Resolve options while [ $# -gt 0 ] -- 2.30.2